Auto merge of #2062 - aarzee:master, r=steveklabnik
authorbors <bors@rust-lang.org>
Mon, 19 Oct 2015 15:21:07 +0000 (15:21 +0000)
committerbors <bors@rust-lang.org>
Mon, 19 Oct 2015 15:21:07 +0000 (15:21 +0000)
Remove leading newlines; replace lines containing only whitespace with empty lines; replace multiple trailing newlines with a single newline; remove trailing whitespace in lines.

This PR was created semiautomatically.


Trivial merge